Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:48:29 +0000 (10:48 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:48:29 +0000 (10:48 -0800)
commit589d5bcdfc43b6bb24bef0f27f87b0fc01467134
tree821b1bab8b4425fd03815b7723f228f4642f8640
parenta45e287c98cf98f55e1e972fc1e90c2c2d0e68e0
parentd25e159fad2571902feaee341ebb796ea2c1aa84
Merge from trunk.